From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Fri, 11 Mar 2005 00:30:35 +0000 (+0000)
Subject: bitkeeper revision 1.1159.258.45 (4230e6ab4xRdK4pchNbpgZE-preulA)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~127
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0680eec01927469e1985f486d77ffdbdb8747981;p=xen.git

bitkeeper revision 1.1159.258.45 (4230e6ab4xRdK4pchNbpgZE-preulA)

Fix one more pud merge incident.
Signed-off-by: Christian Limpach <chris@xensource.com>
---

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
index e8d48949d3..8a0df417ed 100644
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
@@ -369,7 +369,7 @@ int __direct_remap_area_pages(struct mm_struct *mm,
 		pud = pud_alloc(mm, dir, address);
 		if (!pud)
 			break;
-		pmd = pmd_alloc(mm, dir, address);
+		pmd = pmd_alloc(mm, pud, address);
 		if (!pmd)
 			break;
 		error = 0;